Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Tue, 12 Jan 2010 07:54:18 +0000 (08:54 +0100)
committerJan D. <jan.h.d@swipnet.se>
Tue, 12 Jan 2010 07:54:18 +0000 (08:54 +0100)
commitb6153cfefbe27f9e4daebb1e35e05fb80835ab8c
tree3d0a6e45d8754235f6b18f209e74c5f935db258e
parent3d8a57f9ace36035ef40f4d59687e9f9f1ff7837
parent92b6447863086f64e784fe0c7b6bb57527e76bf2
Merge from trunk